Replace `OpenSimAddTests` macro with equivalent `OpenSimAddTest` for individual tests by nickbianco · Pull Request #4466 · opensim-org/opensim-core

nickbianco · 2026-10-01T18:53:40Z

Fixes issue #4441

Brief summary of changes

The testing macro OpenSimAddTests has been changed to OpenSimAddTest, a mostly equivalent macro for adding a single test target at a time. This change fixes #4441, since now test resources are explicitly assigned to each test target. This also makes it easier to identify which resources are associated with each test just be looking at each test directory's CMakeLists file (rather than parsing through everything individual test).

OpenSimAddTest automatically links to osimTesting and Catch2::Catch2WithMain; other libraries can be linked to via the LINKLIBS argument, as before. Other arguments include RESOURCES, to specify test resources, EXTRA_SOURCES to specify any related .h or .cpp files, ENVIRONMENT to provide test-specific environment variables, and DISABLED to indicate to CTest to skip the test when running the test suite.

Other changes include:

Usage of MocoAddTest in OpenSim/Moco/tests/CMakeLists.txt has been replaced with OpenSimAddTest.
testContext.cpp has been converted to the Catch2 framework, which is necessary since the new macro automatically links to osimTesting and Catch2::Catch2WithMain.

Testing I've completed

Ran tests locally; CI.

Looking for feedback on...

CHANGELOG.md (choose one)

no need to update because...internal test updates.

This change is

nickbianco · 2026-10-05T18:56:35Z

@aymanhab would you be able to review this one?

aymanhab

Just had a few questions, clarifications but looks great. Nice work @nickbianco

@aymanhab reviewed 26 files and all commit messages, and made 6 comments.
Reviewable status: all files reviewed, 5 unresolved discussions (waiting on nickbianco).

Applications/CMC/tests/CMakeLists.txt line 8 at r1 (raw file):

                     resources/*.xml
                     resources/*.sto
                     resources/*.mot

Do we really need to keep around these vtp files?

cmake/OpenSimMacros.cmake line 466 at r1 (raw file):

        # Add the test.
        add_test(NAME ${OSIMTEST_NAME} COMMAND ${OSIMTEST_NAME} ${test_args})

At some point we used symlink to avoid copying resource files, is that still the behavior? If not, are there any noticeable effects on time or space to run the tests?

cmake/OpenSimMacros.cmake line 476 at r1 (raw file):

                ENVIRONMENT ${OSIMTEST_ENVIRONMENT})

        # Copy test resources.

Do we know if any of these commented out flags were actually used? Should we keep these options easy to toggle?

OpenSim/Common/tests/CMakeLists.txt line 22 at r1 (raw file):

if(WITH_EZC3D)
    OpenSimAddTest(NAME testC3DFileAdapter
            LINKLIBS ${OSIM_COMMON_TEST_LIBS}

Glad to see this reversed 👍

OpenSim/Simulation/SimbodyEngine/tests/CMakeLists.txt line 7 at r1 (raw file):

        LINKLIBS osimSimulation osimCommon osimAnalyses
        RESOURCES resources/testJointConstraints.osim
        )

May not be related but I'd think tests under Simulation library would not need to link osimAnalyses

nickbianco

Thanks @aymanhab! I've addressed all comments.

@nickbianco partially reviewed 26 files and made 6 comments.
Reviewable status: 25 of 26 files reviewed, 5 unresolved discussions (waiting on aymanhab).

Applications/CMC/tests/CMakeLists.txt line 8 at r1 (raw file):